Add package-filtering to the combined branch