Merge branch 'fix-app_architecture' into 'master'

Fix app architecture

See merge request !5
2 jobs for master in 5 minutes and 22 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #29577
build

00:02:40

passed #29576
build-without-auto-install

00:02:41