Fix #1716
Test case for #1716
Updated CHANGELOG