resources: Merge branch 'release-staging-v21-1' into develop

Change-Id: I7b2b3d136c07faafd656cc8c058ad106d5ecc447