Merge branch 'release/7.x-0.2' into dev