Merged log & history logging