Add changelog entry for merged #7359.