CA-122205: Addressed review comments