Merge branch 'issue716' into 1.6.x
add test resources
Merge branch 'issue721' into 2.0.x