Merge branch 'sh/rebase-i-p'