TUP-2240: fix remaining problem for context view on TOP.
Merge branch 'maintenance/5.6'