Merge 2.1.0-RC2 bug fixes into master

No review