Merge "Add getter for filter in Field" into tm-dev