before java rk3 night
after merge