Imported Upstream version 2.0.0.247
Merge tag 'upstream/2.0.0.247'

Upstream version 2.0.0.247
updates for p247