DP-127 Added more logging