Based on the supplied test cases, it appears this issue was resolved by HHH-11748; ergo this issue is being closed. If this is still an issue, please reopen with an updated test case that highlights the existing failure.