Merge "add more logging into DRT"