Updating dev-freeze with current code.

From this point on until staging is over, please target dev-freeze with dev fixes.