Merge branch 'jn/grep-open'