SP-476 - Backport BISERVER-10129