ohad's changes - squash this commit
extra string interpolations i18n - squash this commit