Merge branch 'jk/misc-uninitialized-fixes'