DF#QCADOOMES-1731 Some fixes in production tracking.