Merge branch 'release/7.x-1.x-alpha1'
Merge branch 'hotfix/7.x-1.x-alpha1.1' into develop