Imported Upstream version 3.4