Imported Upstream version 0.84
Merge tag 'upstream/0.84'

Upstream version 0.84