Merge branch 'ab/env-array'