Imported upstream 5.5.36