Merge branch 'hotfix/fixed-old-api-call'
using current location.protocol
using location.protocol