Sync of the master demo with this branch