CP-5050: Addressed review comments