Merged fix for ; in env var values