Merge "Switch to using override type enum" into main