Fix fluent interface
Remove useless lines
Merge pull request #3964 from neeckeloo/fix-fluent-interface

Fix fluent interface
[#3964] CS fixes

- trailing whitespace
Merge branch 'hotfix/3964' into develop

Forward port #3964