Rebase and ChangeLOG for pr/1785

closes #1785