Rebase and ChangeLog for PR 1577

closes #1577