Merge branch 'release/7.x-0.3' into develop
Minor fix
Tagging version 7.x-0.4
Merge branch 'release/7.x-0.4'