Merge "Addresses further review comments from ag/8000041"