Update master from development 1.4.0.0.4