Merge pull request #23819 from safern/merge-master-nullable