Merge "Fix hang/crash in native path code" into jb-dev