R1:abc79a2101bc

Update celerity map after many merges, etc.