Merge hotfixes v2.2.0