Related polishing

Issue. SPR-11428
(cherry picked from commit 9c6df76)
Mixed polishing along with recent changes
(cherry picked from commit 14e5a02)