Issue #1604 has been add to CHANGELOG