add resource filter
Merge origin/master
add test data