Merge branch 'traff/terminal-urls'