Merge "Additional log instrumentation for multi-user" into oc-dev