Merge branch 'cb/maint-1.6.3-grep-relative-up' into maint