Merge from development 3.0.0.5.0