Gunnar Morling, please go ahead and merge the fix from your pull request.

Also, please try running the test in your pull request on master. If it works, then please commit it using this JIRA issue.

If it doesn't work, then please create a new JIRA for fix version 5.0.0, mark the test @FailureExpectedWithNewMetamodel, and commit the test using the new JIRA issue.

Please resolve this issue when you're done. I plan to release 4.3.6 Wednesday afternoon or evening (Pacific time), so please resolve before then.

Thanks!
Gail