merge dev_2.0 to master