Merge "Turn off logspam" into oc-dev