Fix CS
Merge pull request #738 from romainneutron/3.8-CS

[3.8] Fix CS