TRUNK-3850
Merge pull request #642 from suraj5/TRUNK-3850

TRUNK-3850