PR: 233737 Submitted by: Charlie Li (original version) exp-run by: antoine Sponsored by: B3 Init (zeising)