Qa calls

Merging qa_calls into Master.
Then please add a test.