fix missing bits of changeset 040462701f87
clarify changes since X
changelog for stable branch