Merge v0.5.x series into master

- [x] merge `master` back

and that's it!