Roll up of 2.0-no-bin-compat into 2.0 for 2.0.3

No review