Working my devices on android
Merge remote-tracking branch 'origin/development/architecture' into development/architecture