Dev-freeze merge.

Updating dev with fixes from dev-freeze.