Merge branch 'logger'