Merge branch 'jk/misc-fixes-maint'