Imported Upstream version 9.4.6-1770165