Merge "DO NOT fail if global-vars-.sh is not configured"