Merge to stable

This is fairly stable for them next alpha