SUMO-12582 Millis