Includes `Decapsulate`/`Encapsulate` changes from #2282

This should hopefully be the last `.rc` before a final stable release,
as I'm otherwise happy with the API now