Merge rowFilter from master