Backport https://github.com/chipsalliance/caliptra-sw/pull/3624 to 2.0
Backport #3624 to 2.0