Imported Upstream version 6.5.1
Merge tag 'upstream/6.5.1'

Upstream version 6.5.1

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