Merge branch 'release/7.x-0.10' into develop
fixed some (not all) errors in test
Tagging version 7.x-0.11
Merge branch 'release/7.x-0.11'