Merge branch 'ag/rebase-i-in-c'