Merge branch 'jc/maint-name-rev-all' into maint