Issue #22676:add context menu options
Merge pull request #333 from garyhgohoos/22676

Issue #22676:add context menu options