Fix compilation issue following the automatic merge