Merge branch 'os/fix-rebase-diff-no-prefix'