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