Merge branch 'origin-hotfix-7.8.06'