Merge "fix missing include" into oc-dev