Merge from pending; try to fix-up suboptimal ses ChangeLog.