The above seems to work ok. See the attached branch. Maybe one of the other affected users would be so kind as to test the branch on a (copy of a) real world environment.
The above seems to work ok. See the attached branch. Maybe one of the other affected users would be so kind as to test the branch on a (copy of a) real world environment.