CP-8514: Addressed review comments