TDI-30488:fix several context pbs.
Merge branch 'maintenance/5.6'