TECS-WIP : Fixed compile error following rebase on origin/master