Merge branch 'jn/document-rebase-i-p-limitation'