Merge "AOD: More VisD updates" into oc-dev