Merge review of 9.47.1