Polishing

Issue: SPR-10807