Merge "Fix IllegalArgumentException" into main