7.x code review