Merge from 3.5.0 release branch