Imported Upstream version 7