Polishing

Issue: SPR-10752
Issue: SPR-10627