Merge branch 'sb/prepare-revision-walk-error-check'