HHH-12150 is currently set to be fixed in 5.3.0. I have some time I can spend on this. There's another issue involving @MapKeyColumn, HHH-10575. Should I work on these, or something else for 5.3.0.Beta?