Fix #1620 #2930

Job	Run time
macos-arm64-internal-release	23m 20s
Check for Max SDK	1s
linux-x64-internal-release	7m 17s
macos-arm64-internal-debug	7m 10s
linux-x64-internal-debug	6m 59s
macos-arm64-external-release	12m 26s
linux-x64-external-release	7m 48s
macos-x64-internal-release	15m 13s
macos-x64-internal-debug	12m 9s
macos-x64-external-release	14m 20s
windows-x86-internal-release	21m 7s
windows-x86-internal-debug	19m 6s
maxplugin-${{ matrix.cfg.str }}-${{ matrix.cfg.sdk-version }}	0s
windows-x86-external-release	21m 3s
windows-x64-internal-release	20m 40s
windows-x64-internal-debug	19m 14s
windows-x64-external-release	20m 46s
	3h 48m 39s

Provide feedback