DF# QCADOOMES-2325 hotfix