Resolving as a duplicate of HHH-9605, since that Jira contains a pull request with a test case and fix.