Merge logging changes