Merge changes from 2.0-no-bin-compat into master for 2.1.0-RC1

No review.