DC, Vishnu / #4041 / Trying to fix failing FT tests