merge in v0.25.0