To update on this one,
We have a solution in test and is now in the testing process so we can make absolutely sure we have a reliable fix. Realistically, I don't see this making Patch 1.08 due to timings, but we do have this planned for an upcoming patch.
However, as more experienced users will know, this is all subject to change until its in those release patch notes. Thanks for the feedback on this.