Merge pull request #15622 from clairemcginty/claire/cherrypick-beam-12628