Merge "Validate mapping exists when creating/updating a protocol"