Merge branch 'master' into migrate-to-md