Merging fix for log messages

bug 1118