Merge 'translate-routes' to 'master' branch