Merge branch 'release/7.x-0.17' into develop
US1196 help_text
US1196 help_text helptext
updated to version 7.x-0.18
Merge branch 'release/7.x-0.18'