Merge branch 'jc/pull-rebase-ff' into maint