merging 2.1 no bin compat into 2.1

no review