Imported Upstream version 6.5.5
Merge tag 'upstream/6.5.5'

Upstream version 6.5.5

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