Changes to development environment and product model.
Merge branch 'edwin/iteration5'