Sync delivery to release230 for 23-rc3 #7673

Closed ebarboni closed 1 week ago