Merge from develop to master

Merging develop to master since over the half of milestone 2.2.0 was finished