Merge master into qa_calls

The QA Calls should probably receive the updates pushed into master.