fix CS
fix test failing jenkins + CS
more CS
Merge pull request #4739 from antograssiot/3.0-fix-cs

3.0  CS correction