Merge branch 'sh/pull-rebase-preserve'