Master merge ix 9.19.7