HHH-9279

Merges the changes for HHH-8237 from 4.3 to master and disables the tests added for this feature as they don't pass anymore on master, presumably due to the meta-model changes.