Imported Upstream version 3.9.4.1