Merge from development 1.7.0