Merge branch 'release/7.x-0.18' into develop
Bugfix - Bugzilla: #16484
Tagging version 7.x-0.19
Merge branch 'release/7.x-0.19'