dev_1.1, again 2x
fixed conflict in merge dev_1.1 to master