[TD-9840] Extra logging for TD-8779