This should fix compatibility issue with new versions
Merge branch '2.2-merge' into 2.2
Merge remote-tracking branch 'original/2.2' into 2.2