Merge branch 'master' into refactor/switched-dependencies-status-badge