Release 2.1.2

This is so we can review the changes we want to cherry-pick into a 2.1.2 release prior to merging the new-split branch into develop.