Merge branch 'hotfix-2.1.2-less-slots'
Some text clarifications.
Merge branch 'hotfix-2.1.3' into develop