Merge "Fix Emulator not emitting folding features." into tm-dev