Merge "Refine systemfeature codegen behavior" into main