Merge "Address comment from ag/12107302" into main