TDI-30488:improve some GUI here.
Merge branch 'maintenance/5.6'