case 3697 - Improve verbosity of log messages.
Merge branch 'case-3697' into develop