I pushed v12 (with some cosmetic adjustments) into the back branches, since we're getting close to the February release freeze. We still need to deal with the larger fix for HEAD. Please re-post that one so that the cfbot knows which is the patch-of-record.
Thanks for the adjustments and pushing!
Here is the patch for HEAD. I simply re-posted v10. Nothing has changed.