Imported Upstream version 3.6