Imported Upstream version 2.0.6
Merge tag 'upstream/2.0.6'

Upstream version 2.0.6
Imported Upstream version 2.0.7
Merge tag 'upstream/2.0.7'

Upstream version 2.0.7
log changes