Merge branch 'mh/html-path' into next