Fixed QA/QC not working from Output page
Merge branch 'jon' into sprint14