Merge branch 'hotfix/5.26.1'