Pull 1844 - Adding/deleting domain wide env variable