(Issue589) Addressed review feedback