Merge branch 'release/7.x-0.16' into develop
Tagging version 7.x-0.17
Merge branch 'release/7.x-0.17'