aligned with core version 0.0.16