Imported Upstream version 1.65
Merge tag 'upstream/1.65'

Upstream version 1.65

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