Apply same fix as MDL-39164 and codechecker cleaning