Merge branch 'tb/no-relative-file-url'