Merge "Add UID in bugreport" into oc-dev