Updated: core (all)