Version history 2.2.0.0
Merge 2.2.0.0 to master