Imported Upstream version 0.5.0
Merge tag 'upstream/0.5.0'

Upstream version 0.5.0