Updated: core-563 (fr_FR); core-dev-57 (all)