Merging logging changes from kernel