Merge "Support abortScan" into oc-dev