Merge from development 3.0.0.1.0