Merge "Call Filter from a separate function" into tm-qpr-dev