Polishing

Issue: SPR-12502
(cherry picked from commit 26845f6)