Imported Upstream version 1.9.3.374