Merged LoggingBranch changes.