Resolve merge conflict between #10373 and #10431