Merge pull request #8027 from bbodenmiller/patch-7

update changelog