Merge "DO NOT MERGE Fix Emulator not emitting folding features." into sc-v2-dev