Merge "Optimize SystemConfig feature parsing" into main