Add #2586 to CHANGELOG.