Merge branch feature/kawabata
fixed conflict