dfd0436ad0
Merge "merge" branch to bring in various bug fixes that are going into 3.8
Merge "merge" branch to bring in various bug fixes that are going into 3.8