Merge branch 'ag/rebase-p'