CA-116545: Addressed second set of review comments