Merge branch 'rj/warning-uninitialized-fix'