misc: Merge branch 'minor-release-staging-v21-0-1'

Change-Id: I4ac09b563094f5b375246ee87eca364e5b6e131b