MODE-1935 - Updated logging as per review