2.1.x

Due by December 01, 2018 20% complete

Things that need to get cherry-picked into the 2.1.x series.