Include Pr33822 changes #24

Job	Run time
Build and Test (macos-latest, 9.0.x)	34s
Lint/Format Check	32s
Build and Test (ubuntu-latest, 9.0.x)	38s
Security Scan	21s
Conformance Tests (macos-latest, darwin_arm64)	38s
Conformance Tests (ubuntu-latest, linux_amd64)	28s
	3m 11s

Provide feedback