Merge branch 'rr/rebase-sha1-by-string-query'