Imported Upstream version 4.3.1