Partially fixed demo system
Merge remote-tracking branch 'origin/develop' into develop-experiments