Optimize sorting visually
Merged changes
Merge branch 'mr-mig-raf-visual-optimization'