Imported Upstream version 3.5.0