CVID-1641 Adding additional logging