; Backport ChangeLog.2 fixes from master