TDI-30488:fix several context pbs.