Merge in local work

Will do a more formal review as we head to master