Maint/master/missing cherries from 12x

Here are some missing changes to the 1.2.x that need to be picked into master.