Update logging
Merge branch 'master' into addFiles2Arch