Merge "Add package filtering to NLSes" into sc-dev