BST-4241 - Alberto - adding extra logging information