Merge "Catch IllegalArgumentException as it might indicate corrupted packages.xml" into main