Merge from development 3.0.6.1.0