Merge branch 'hotfix' into olivier