Merge "DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter" into sc-v2-dev