Merge commit for #11233