Merge "Fix optimizable package filter"