Merge branch 'nd/grep-assume-unchanged' into maint