SC#QCADOOCLS-2236 fixes in production tracking terminal