Merge "Add support for https"