Merge branch 'merge' into next

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