Merge "Fix log reporting"