Merge "Compare against correct user id to determine static lib clients" into oc-dev