Imported Upstream version 6.4.7
Merge tag 'upstream/6.4.7'

Upstream version 6.4.7

* tag 'upstream/6.4.7':
  Imported Upstream version 6.4.7