Incorporate ClassRegistry changes from upstream.
- 8c2a1aab5dc4
- 2bbd6d33b074
- debb842aa9b1
- ce4d49bbd184
- 86b6a4a18a7b
- 7da3433e6b84
- d68417f9c399
- b11d798d5fa4