CMenuOptionStringChooser:: optionValueString mismatch, supplement to cbc9299df8cd5fb1639f9e7db9db59ce9ce3fbf6
Merge remote-tracking branch 'cool-next-cc/next-cc'