Miscellaneous commits to add to next

Misc commits to add to next