Merge pull request #12324 from chrishenzie/nil-ptr-deref #1619

Job	Run time
build (macos-latest)	5m 28s
integration-tests (ubuntu-latest)	52s
integration-tests (macos-latest)	1m 35s
build (ubuntu-latest)	5m 13s
build (windows-latest)	9m 43s
integration-tests (windows-latest)	2m 39s
	25m 30s

Provide feedback