Merge "Add missing test from ag/30322765" into main