expose ids for models
Merge branch 'master' into ui