checkstyle for common
Merge commit '90f3973b6d7601fb23c8893f02ef0cd54de4598b' into dev