Backport missing commits from 1.2.x branch to master

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