Updating branch qa_calls to latest master