Merge branch 'jc/is-url-simplify'