We’ve now pushed a series of updates in this area. These two commits are particularly relevant:
Please try updating to the current develop branch and see whether it fixes the issue for you. Please also let us know if you spot any regressions or new problems. Thanks!