Merge "Fix code accounting bugs, track external app data." into oc-dev