Merge "Sanitized uri scheme by removing scheme delimiter" into main