Updated: core-563 (el_GR); core-dev-56 (el_GR)