Merge "BUG 7502: Switch throws an error message for the action type"