Rebase and ChangeLOG of pr/1898

closes #1898