TDI-30940:improved the context function for SAP wizard.
Merge branch 'maintenance/5.6'