update to 7.x-0.17
Merge branch 'release/7.x-0.17' into develop