DF# QCADOOMES-2257 + minor refactor