Use default of 'model' for data object type
Merge branch 'master' into collection-bind-race-condition