Build fix for CTL-409