Related polishing

Issue. SPR-11428
Mixed polishing along with recent changes