Fork that address MCHECKSTYLE-169