SP-474 - Backport of BISERVER-10228
Merge pull request #943 from rmansoor/5.0

SP-474 - Backport of BISERVER-10228