Update master from development 1.2.0.6.0