Merge "Optimized locking for get/setUserData" into oc-dev