uctcd merge with simulator