QAQC speedbug fixes
Merge branch 'jgooderham' into msharman