Merge "Logging implementation"