Merge pull request #378 from xliiv/ser-env-fields

service & environment fields
Merge branch 'synergy' into ser-env-fields