Merge "Fixed the obsolete logging" into oc-dev