Merge branch 'hotfix-3.07.3'