Merge "Fix crash java.lang.IllegalArgumentException" into main