Merge branch 'ab/grep-lose-opt-regflags'