QA -> Staging

Merging changes in the QA branch into Staging.