Imported Upstream version 1.008014
Merge tag 'upstream/1.008014'

Upstream version 1.008014

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