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