Cherry-pick to 23.12
requested review from @rosik
assigned to @vifley
changed the description
approved this merge request
merged