Upgrading OG to 2.2

Relate to issue #2498