Polishing

Issue: SPR-11372