Fix #1449

(cherry picked from commit 7f2c0364b7bbad6bbcd16ee10b8bbfb3fd19c42a)
Updated changelog