Merge "Fix Java crash problem" into main