Merge branch 'master' into self-hosted