Implementing https fix reported in CONTRIB-4588