Merge "Fix a bug that would access uninitialized data." into tm-dev