checkstyled encounter type
Merge origin/master