[changelog] reflecting fixes #2701 and fixes #2704 in the changelog
[changelog] reflecting fixes #2701 and fixes #2704 in the changelog

rzwitserloot/lombok,rzwitserloot/lombok,rzwitserloot/lombok,rzwitserloot/lombok,rzwitserloot/lombok