Self-hosted #234249