Merge "Remove/Cleanup Obselete References" into oc-dev