Imported Upstream version 0.10.55
Merge tag 'upstream/0.10.55'

Upstream version 0.10.55