I left 5.4.1 as a fix version, since this is actually a different bug than described by HHH-13129 Resolved .

I resolved it as a duplicate of HHH-13129 Resolved , because the commit that fixes this issue has a message that mentions HHH-13129 Resolved only. It should have mentioned both HHH-13129 Resolved and HHH-11807 Resolved .