Merge branch 'jk/maint-rev-list-nul' into maint