supplement to 8d7fd8de756a2d01998d11f32f736b7e72e53139
Merge remote-tracking branch 'cool-next-cc/next-cc'