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