Merge Errors
Merge branch 'hotfix/3.9.74'