Imported Upstream version 3.9