Polishing

Issue: SPR-8045