attempt to tackle #356
Add changelog entry for 8ed76348f234e8880aadd55157ef076cbec9efee