[CLC-2122] Minor refactoring, including the diagnostic messages
[CLC-2122] Adjust recording to cover all cases, message formatting change
[CLC-2122] Logging more