Merge branch 'jc/rebase-limit'