Merge to master

Merges to the latest state
Additional merges