Adds environment aware configuration support
Merge branch 'attn-environment-aware' into develop