Merge branch 'feature-environment' into 'master'

Added environment support

Closes #1

See merge request !1
1 job for fix-group-sync