Thanks @julliard for implementing this!
For reference; something similar to this MR was done by @julliard, in commits 73ab9ca8d0c6d2602702b1a37860ab1ec569f510, 0621c02215d3c78552d05be27bfcd33335512b2c, 4a026d7aa67aae84a733303b605f98ef1ea366ca, 45a2ae766241720320cef65ffec305aefc3b374b, 930106855f3f52dee01ba44b5d41a33974dfd26e. Those commits apply almost cleanly on top of the 10.0 tag too (only one minor near-trivial conflict).