Aggregate changes from 3.5 pre-releases
(cherry picked from commit ac11043f9835051d711d628d253d8f402a6d05a0)