SP-576 - Backport BISERVER-10302
Merge pull request #961 from rmansoor/5.0

SP-576 - Backport BISERVER-10302