Merge "Filter empty paths at record time"