Polishing

Issue: SPR-10629
Merge branch 'SPR-10629' into SPR-8696