Merge "Move PackageManager to new auto-doc feature!" into oc-dev