0.9.0 RC2 changes.

Cherry picks from master for 0.9.0-RC2