Imported Upstream version 9.9.5
Imported Upstream version 9.10.0.P1