Merges from Jake's PR.

Continuing to test azure deployment.