[1058249] Addressed review