Sync delivery to master after 23-rc3 #7672

Closed ebarboni closed 1 week ago