Merge "Logging changes and unit tests"