TDI-30709:MR job_can't do expand and collapse action well
Merge branch 'maintenance/5.6'