I proposed a solution in HHH-11042 Open which is a duplicate. You can use that as workaround until it is merge into core.