Add OG 2.x support

Closes #3517456

Merge request reports

Loading