Merge branch 'dev_2.0'