Copy pasta fail
Merge branch 'hotfix-2.3.38' into develop