SP-576 - Backport BISERVER-10302