Merge pull request #23922 from seamuslee001/str_func_null_1