Sync with filtering clarifications in 3.0 branch.