Imported Upstream version 4.9.6