Imported Upstream version 3.8.0
Imported Upstream version 3.10.0