Release/2.2.0

Merge changes from release 2.2.0 to develop

IMPORTANT! Merge after release completed.