Merge "Handle _ and % in paths" into jb-dev