TDI-30442:improve the style of context natTable and refactor some code.
Merge branch 'maintenance/5.6'