Fix cs error introduced after resolving merge conflict with master to 2....

...6