Re #1114 log refactoring