Merge "Remove data from DiscreteRegistry for uninstalled packages." into sc-dev