Merge "Refine the ProgressCategory" into oc-dev