release 7.x-0.4
Merge branch 'release/7.x-0.4' into develop