Properly skip fields - there were invalid fields getting in and skip didn't work directly on the model
Merge branch 'refs/heads/2.3/develop' into 3.0/develop
Merge branch 'refs/heads/3.0/develop' into production