HHH-9241
Fixing check style issues