Josh Cummings 78a4360526 Merge branch '6.2.x' 1 rok pred
..
java 78a4360526 Merge branch '6.2.x' 1 rok pred
kotlin bd98343b9c Fix checkstyle errors 1 rok pred