Merge branch 'hotfix/cluster'
Merge branch 'release/v2.9'
A few corrections to help text.
Merge branch 'hotfix/changesFromLS' into develop