Since my first attempt to address this via manageable rebase went ignored, this needs to be tediously hand picked (ready in my branch).