Master merge IX-9.19.6