Merge branch 'hotfix' into make-improv