Merge "Remove filtering of DiscreteRegistry events by uid." into sc-dev