Issue #2325683: Make fields-based option sets self-contained instead of relying on an extra db table