Fix some checkstyle errors
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' into ui/dev