Merge pull request #2889 from Sharmalm/2840