Merge to master

I don't expect to merge all these but wanted to generate a comprehensive PR will the full delta from develop to sort through the changes.