Setup: bugfix
Merge branch 'hotfix' into RC2