MDL-48142 Fix code checking issues