Merge branch 'logger-accept-handlers'