add SPR-10588
Merge remote-tracking branch 'origin/master'