Merge "change made to enable https mode"