Imported Upstream version 3.7