2.0 no bin compat

Roll up 2.0.1 changes into master for 2.1