merge plugins v1.8 beta

This is an early beta, and doesn't have all planned features yet.