Merge "Quick reject empty paths" into jb-mr1-dev