Merge pull request #6783 from nupplaphil/feature/replace_q_calls