TDI-31369:The context value can't be removed
Merge branch 'maintenance/5.6'