Merge branch 'SPR-10629' into SPR-8696
Fixed merge