Miscellaneous commits to add to next