Imported Upstream version 3.8