Do not use OE2.2 only function calls within the master branch