Task #1032 - changing so that qc is separate now