CA-102329: Addressed review comments.