Gail Badner, I've merged the PR to fix the issue in 4.3.6. I've also merged the changes to master, but the (newly added) tests fail there as you kind of assumed. I've created HHH-9279 to fix the issue on master and re-enable the tests which I disabled for the time being via @FailureExpectedWithNewMetamodel.