PR for dev_1.0