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