Changes to support executeContextAction