Imported Upstream version 0.10.46
Merge tag 'upstream/0.10.46'

Upstream version 0.10.46