Catch up with 2.0-no-bin-compat in master