Master -> QA

This PR is to pull fixes for the current iteration into QA, since the devs forgot. :(