Merge "Add flag to values for disableHttp"