Merge "Added missing lock and clean up locked function that wasn't locked" into oc-dev