Updated: core (all); core-562 (ar); core-5621 (ar)