Matej Novotny started work on Bug CDITCK-596