Testing to Master

Migrate 63 commits to master from testing.