Imported Upstream version 1.3.8.2
Merge tag 'upstream/1.3.8.2'

Upstream version 1.3.8.2
update patches for 1.3.8.2