Fix #1556
Test for #1556

(cherry picked from commit 136bd3c414cc762268d01698b329958369c9d929)
Updated changelog
Regenerated build/