log entries from 2.3 merge