TDI-30442:change the default selection style and improve some code.
Merge branch 'maintenance/5.6'