Start things on env
Merge branch 'develop' into feature-env
Deep refactoring of environment. Step 1
Deep refactoring of environment. Step 2
Delete IStateIntProcedure
Update templates
Merge branch 'develop' into feature-env
Merge branch 'feature-env' into develop