Merge "Enabling filtering by base intent package."