Merge "Fix uninitialized var compiler warnings" into main