Merge branch 'jc/rebase'