merge from branch 4.0