Merge branch 'nd/grep-true-path'