CA-116545: Addressed review comments