Marcus Hert Da Coregio 423d414575 Merge branch '6.1.x' into 6.2.x 1 rok temu
..
java 423d414575 Merge branch '6.1.x' into 6.2.x 1 rok temu
kotlin 1b28351693 Fix checkstyle errors 1 rok temu