Issues #66 and #1710 added to CHANGELOG