Merge "Make enum use C compatible." into main