Merge pull request #23589 from demeritcowboy/null