Merge "Log excessive remote callbacks" into oc-dev