aligned with core v0.0.13