planned architecture
Merge branch 'dev'