Issue #2300903: Convert option sets to non-fieldable entities