Good day all,

Submitting patch for envstore-2.1.
Let me know if I need to make any changes.