Merge v9.47.1 to Master