Merge "Addressed missed comments from ag/24539449" into main