Further polishing

Issue: SPR-10940