Merge branch 'hotfix-7.8.06'