update
Merge branch 'hotfix' into RC1