Merge pull request #1450 from NVIDIA/backport-1410-to-release-1.18 #1356

Job	Run time
variables	4s
code-scanning / Analyze Go code with CodeQL	1m 34s
golang / check	36s
golang / Build	20s
golang / Unit test	49s
image / packages (centos7-aarch64, false)	19m 18s
image / packages (ubuntu18.04-amd64, false)	3m 15s
image / packages (ubuntu18.04-arm64, false)	20m 3s
image / packages (centos7-x86_64, false)	3m 16s
image / image (packaging)	1m 12s
image / image (application)	7m 20s
e2e-test / e2e-tests (false, 550)	17m 20s
e2e-test / e2e-tests (false, 575)	16m 47s
	1h 31m 54s

Provide feedback