(Issue550) Self review