Merge "Add test for ag/21688405" into main