Polishing

Issue: SPR-8045
(cherry picked from commit 7eee7d2)