Polishing

Issue: SPR-12476
(cherry picked from commit c89d8ec)