Imported Upstream version 1.3.6.4
Merge tag 'upstream/1.3.6.4'

Upstream version 1.3.6.4
Update patch for 1.3.6.4