Imported Upstream version 0.90.1
Merge tag 'upstream/0.90.1'

Upstream version 0.90.1