cleanup + refactoring
Merge branch 'release/7.x-0.1.1'