Merge branch 'mk/grep-max-depth' into next