Merge branch 'release/2.0.x' into main

Accommodate changes made during release v2.0.0

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