Fixed checkstyle issue
Merge branch 'master' into dev