Subset of changes needed for models
Merge branch 'modelsubset' into models