Merge "Filter package manager calls" into oc-dev