website: Merge branch 'release-staging-v21-1' into stable

Change-Id: I3750431e5b8aea782ffa1612418d6a299faed2bb