Anyone willing to try out these changes? I can create a Pull Request against 4.3 if anyone is willing to grab it, build it and give it a try.