Merge branch 'rs/work-around-grep-opt-insanity' into maint