Merge branch 'release/2.0.x' into main

Accommodate changes made during release v2.0.0

Signed-off-by: David Hu <david.hu@arm.com>
Change-Id: Ic28ef51065f6ba5ca41066961b0e378e3511eff2