Copy pasta fail
Merge branch 'hotfix-2.2.40'