logging updates
Merge branch 'master' into base-containers