Convert protocol-specific to protocol-independent URLs
Merge branch 'feature/protocol-independence' into develop