merge translator updates from dev branch