TDI-31076:Swtich between context use mode lost some parameters.
Merge branch 'maintenance/5.6'