MAESTRO-2540 New demo compositions (commented out)