merge in v0.24.0