Radim Vansa, just to make sure I understand. Are you saying that the attached HHH-10677.diff will fix this issue? Can you suggest a unit test that could be updated to reproduce this issue?