Resolve merge conflict between #10440 and #10304