Merge branch 'master' into fix-self-hosted-stale-bundle-download