Small fix to the previous commit
Merge branch 'hotfix-2.1.11' into develop