Imported Upstream version 1.8