More models for placement
Merge branch 'master' into DesignTeam