Merge branch 'ep/shell-assign-and-export-vars'