Merge pull request #7484 from joelucid/lpf_filter_changes