pull in 0.10.25 updates
@0.10.24 from core