3.8 updates#44

macornwell merged 12 commits intomastermonolithst/functional-models:masterfrom

3.8-updatesmonolithst/functional-models:3.8-updatesCopy head branch name to clipboard