Merge branch 'jk/pull-into-dirty-unborn' into maint