CLC-4091 - Added logging statements