Merge "Fix logging dependency conflict"