First commit

This is a fairly critical patch to our ecosystem. Please consider it with proper cautiousness and proceed slowly.