Logging improvements
Merge branch 'develop'