First server commit in a long while