Issue #20810:enable substitute context menu option in new mode only
Merge pull request #118 from garyhgohoos/20810

Issue #20810:enable substitute context menu option in new mode only