Merged trunk into logging