Jan-Willem Gmelig Meyling, I created a new PR for HHH-12436 Open . It should fix this issue. Please give it a try and let me know if it does. Thanks!