Merge "Fix Filter callback race condition" into tm-dev