2.2.0

Merging branch 2.2.0 to master since I have tested it and works good. After this branch 2.2.0 will be deleted