Fix http vs https request identification
Merge branch 'oai' into eco-full-integration