Catchup

Catch this repository up to some of our internal changes. See the CHANGELOG update for what's included.