Merge pull request #2637 from Sharmalm/2348