Imported Upstream version 3.10