Revert "Revert "Merge branch 'self-hosted'""

This reverts commit 39903f13229b9c94668a41046fb9fe049aa2e9eb.