A previous change reverted by accident in the previous commit
Merge branch 'hotfix-2.1.8' into develop