Merge branch 'pw/rebase-r-fixes'