Merge pull request #512 from dkithmal/TRUNK-3919

Trunk 3919
(cherry picked from commit ff984a0e58f79928715dba79be87a15385c40353)