SP-474 - Backport of BISERVER-10228