Missing bug fix into ChangeLog
(cherry picked from commit 0f153a3ea67b80966e43b3bf7f575ab9f3a867b4)