A set of changes based on former code review.