Merge "Fix URL validation"