TDQ-9649 Fix problem of selection block/match key when reopen
match analysis.
Merge branch 'maintenance/5.6'