Merge "OptionGroup: fixed Names field & ListItem disabled / selected flags"