Qa calls

Merging qa_calls into Master.
Where does `server_id` come from here?