Left off from previous commit
Merge branch 'hotfix-2.3.19'