Shared: Improvements to content-sensitive model generation

Shared: Improvements to content-sensitive model generation #8644