session.site.name instead of buildEnvironment
Merge branch 'develop'