Lcg/1781

closes #1781 

rebase and CHANGELOG.md entry