Fixed a copy paste fail in the previos commit
Merge branch 'hotfix-2.2.29'