change for re-merging to dev_1.0