Merge from old 9.7