Add patches from upstream to fix #3837
update changelog