Matej Novotny updated Feature Request CDITCK-599