Merge "Revert "Revert "Fix optimizable package filter"""