Merge branch 'nd/grep-true-path' into maint