Fix cs error introduced after resolving merge conflict with master to 2.6
Merge pull request #4047 from ceeram/2.6-cs

Fix cs error introduced after master to 2.6 merge.