Code

Merge branch 'rs/grep-function-context'