I believe this duplicates HHH-5855 Closed , which was fixed in 5.0.8. Could someone please give 5.0.8 or a later version a try to see if it is fixed?

Unfortunately, the fix for HHH-5855 Closed causes HHH-11209 Open , and I'm in the process of fixing HHH-11209 Open .