Ix 9.7.0 code review