CA-115938: Addressed review comments