LPS-44049 Use StagedModelType in a more consistent way in the staging framework