Master updates to dev-freeze