commit to dev_1.2 D