[3292] Addressed review comments.