Manual merge #5990