Merge branch 'bc/grep-i-F' into maint