Fixed checkstyle
Merge remote-tracking branch 'origin/intellij' into intellij