checkstyle arrangement
Merge commit '15d742d314face59fa444fc5cdfa1e852499c56a' into dev