commit to dev_1.2
commit to dev_1.2 again
fixed conflict in merge dev_1.2 to master