merging 2.0 into local

and set local as main branch