See Jira issue HHH-18117
@beikov could you please take a look at this?
Thanks for the test and fix. Please try to add a little detail to the commit messages next time :)