major rewrite
Merge branch 'release/7.x-1.x-alpha1'