Polishing

Issue: SPR-12476
(cherry picked from commit 3b15849)