Version 0.0.7, publishing latest updates to v2.2.0 from upstream