Imported Upstream version 2.0.0-alpha
Merge tag 'upstream/2.0.0-alpha'

Upstream version 2.0.0-alpha
added missing files and changes