added proper env var values to shell script
Merge branch 'development'