Imported Upstream version 0.28
Merge tag 'upstream/0.28'

Upstream version 0.28