Merge "Fix java crash" into sc-dev