Updated: core (all); core-562 (ca); core-563 (all)