Merged 9.7