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