This should fix compatibility issue with new versions
Merge branch '2.2-merge' into 2.2