Feature/env variables override config

Feature/env variables override config #3858