SC#QCADOOMES-1620 refactor quality control