Imported upstream 3.6.0-rc2