misc: Merge branch release-staging-v21-2 into develop

Change-Id: I8200ac51c20117f63b51d555fa2f12e5dd35f22e