depends now on core 0.13.0