logging
Merge branch 'master' into feature/layouts
Improvements.