Add patches from upstream to fix #3837
update changelog
Merge branch 'master' into ngcp3.0