Merge branch 'release/7.x-0.15' into develop
add includes to unit test
updated to version 7.x-0.16
Merge branch 'release/7.x-0.16'