Merge "Add tests for ag/2086796"