Model data updates from testing#355

leviathan747 wants to merge 3 commits intomasterxtuml/models:masterfrom

12941/v7.8-updatesxtuml/models:12941/v7.8-updatesCopy head branch name to clipboard