DF#QCADOOMES-2314, QCADOOMES-2307 pkt fixes