Merge branch 'hotfix/21.56.9' into master