changelog: backport from merlin1
changelog: reconstruct for v1.7.X