Test case for #1716

(cherry picked from commit 8c827883e625f6e5e4def09d9ef88ab1ff6b7f2d)
Fix #1716
Updated CHANGELOG