Merge remote-tracking branch 'origin/hotfix-7.8.06'