HomePhabricator

Merge branch oc5 and improve OC7 compatibility