Merge branch 'hb/t0061-dot-in-path-fix'