Updated: core-dev-56 (all); core-dev-57 (all)