Cherry pick important fixes into 2.1 release branch

[aaronburtle]

We had some important fixes recently which need to be cherry picked for the 2.1 release, this issue tracks that work.