Merge "Resolve possible deadlock in Logging" into nyc-dev