Preliminary PS changes for custom action.