Merge "Yangman - URL data fix"