Merge "Full refactor of Translation APIs." into sc-dev