Merge review of 9.47.1

@reorder Please verify this code is still correct.