DemoApp Setup
Merge remote-tracking branch 'origin/Discoverer' into Discoverer