Tagging version 7.x-0.6
Merge branch 'release/7.x-0.6' into develop