Imported Upstream version 10.0.9