Started rewriting ORM pages
Merge branch 'refs/heads/1.8/develop' into ORM
Clarified the number of methods to set environment