I created a PR with the aforementioned changes.
Michael Rasmussen since testing this is tricky, could you please take a look at it and tell me if you think this will do the trick for you?