Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' into maint