Merge change Ibeb7d4a2

* changes:
  Cleaning up synchronization in Logger.