Auto-Merge pull request #2937 from sreedi/fix-2696