TSP-4673 Last-minute changes for the demo