Merge "add debug logs" into oc-dev