Merge branch 'release/7.x-0.4' into develop
test is GREEN
Tagging version 7.x-0.5.
Merge branch 'release/7.x-0.5'