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