Imported Upstream version 1.8.1
Merge tag 'upstream/1.8.1'

Upstream version 1.8.1