Pull tss-react
-related changes into feature/metadata
#8843
Merged
tss-react
-related changes into feature/metadata
#8843