Fix compilation error as part of merge