Setup: hotfix
Merge branch 'hotfix' into RC2