[SP-1257] [BISERVER-11357] Backport.