Test case for #1399
Test case for #743
Fix #1399
Updated changelog
Regenerated build/ files