Merge "Fix environment variable assignment in init"