HHH-8319
HHH-8319 checkstyle