misc: Merge branch v20.1.0.5 hotfix into release-staging-v21-0

Change-Id: I7383ae1c9870b2f4929601305158030ec3423302