Another round of code cleanup.
Merge branch 'dev' into test
Merge branch 'test' into prod