Release v2.2.0

Merging integration into master, getting ready for releasing v2.2.0