Merge branch 'rs/rebase'