Added support for HTTPS endpoints in catalog
Merged with Master