JAL-3690 update j2s from hanson1 branch 0b8b02bb