Fixes #8979
Updated changelog with #8979