Merged latest JavaGAL modifications