Merge "Fix Issue 59989"